Use __make_integer_seq builtin for std::make_integer_sequence. Patch by K-ballo. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@255162 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/utility b/include/utility index d476c6b..a57e17b 100644 --- a/include/utility +++ b/include/utility
@@ -680,6 +680,16 @@ template<size_t... _Ip> using index_sequence = integer_sequence<size_t, _Ip...>; +#if __has_builtin(__make_integer_seq) && !defined(_LIBCPP_TESTING_FALLBACK_MAKE_INTEGER_SEQUENCE) + +template <class _Tp, _Tp _Ep> +struct __make_integer_sequence +{ + typedef __make_integer_seq<integer_sequence, _Tp, _Ep> type; +}; + +#else + namespace __detail { template<typename _Tp, size_t ..._Extra> struct __repeat; @@ -733,10 +743,12 @@ { static_assert(is_integral<_Tp>::value, "std::make_integer_sequence can only be instantiated with an integral type" ); - static_assert(0 <= _Ep, "std::make_integer_sequence input shall not be negative"); + static_assert(0 <= _Ep, "std::make_integer_sequence must have a non-negative sequence length"); typedef __make_integer_sequence_unchecked<_Tp, _Ep> type; }; +#endif + template<class _Tp, _Tp _Np> using make_integer_sequence = typename __make_integer_sequence<_Tp, _Np>::type; diff --git a/test/std/utilities/intseq/intseq.make/make_integer_seq.fail.cpp b/test/std/utilities/intseq/intseq.make/make_integer_seq.fail.cpp index 2dd6c17..af4a3c4 100644 --- a/test/std/utilities/intseq/intseq.make/make_integer_seq.fail.cpp +++ b/test/std/utilities/intseq/intseq.make/make_integer_seq.fail.cpp
@@ -12,19 +12,23 @@ // template<class T, T N> // using make_integer_sequence = integer_sequence<T, 0, 1, ..., N-1>; +// UNSUPPORTED: c++98, c++03, c++11 + #include <utility> #include <type_traits> #include <cassert> +#include "test_macros.h" + int main() { -#if _LIBCPP_STD_VER > 11 + typedef std::make_integer_sequence<int, -3> MakeSeqT; - std::make_integer_sequence<int, -3>::value_type i; - + // std::make_integer_sequence is implemented using a compiler builtin if available. + // this builtin has different diagnostic messages than the fallback implementation. +#if TEST_HAS_BUILTIN(__make_integer_seq) && !defined(_LIBCPP_TESTING_FALLBACK_MAKE_INTEGER_SEQUENCE) + MakeSeqT i; // expected-error@utility:* {{integer sequences must have non-negative sequence length}} #else - -X - -#endif // _LIBCPP_STD_VER > 11 + MakeSeqT i; // expected-error@utility:* {{static_assert failed "std::make_integer_sequence must have a non-negative sequence length"}} +#endif } diff --git a/test/std/utilities/intseq/intseq.make/make_integer_seq.pass.cpp b/test/std/utilities/intseq/intseq.make/make_integer_seq.pass.cpp index 7e82b94..9bfc5f3 100644 --- a/test/std/utilities/intseq/intseq.make/make_integer_seq.pass.cpp +++ b/test/std/utilities/intseq/intseq.make/make_integer_seq.pass.cpp
@@ -12,14 +12,14 @@ // template<class T, T N> // using make_integer_sequence = integer_sequence<T, 0, 1, ..., N-1>; +// UNSUPPORTED: c++98, c++03, c++11 + #include <utility> #include <type_traits> #include <cassert> int main() { -#if _LIBCPP_STD_VER > 11 - static_assert(std::is_same<std::make_integer_sequence<int, 0>, std::integer_sequence<int>>::value, ""); static_assert(std::is_same<std::make_integer_sequence<int, 1>, std::integer_sequence<int, 0>>::value, ""); static_assert(std::is_same<std::make_integer_sequence<int, 2>, std::integer_sequence<int, 0, 1>>::value, ""); @@ -29,6 +29,4 @@ static_assert(std::is_same<std::make_integer_sequence<unsigned long long, 1>, std::integer_sequence<unsigned long long, 0>>::value, ""); static_assert(std::is_same<std::make_integer_sequence<unsigned long long, 2>, std::integer_sequence<unsigned long long, 0, 1>>::value, ""); static_assert(std::is_same<std::make_integer_sequence<unsigned long long, 3>, std::integer_sequence<unsigned long long, 0, 1, 2>>::value, ""); - -#endif // _LIBCPP_STD_VER > 11 } diff --git a/test/std/utilities/intseq/intseq.make/make_integer_seq_fallback.fail.cpp b/test/std/utilities/intseq/intseq.make/make_integer_seq_fallback.fail.cpp new file mode 100644 index 0000000..b6431b5 --- /dev/null +++ b/test/std/utilities/intseq/intseq.make/make_integer_seq_fallback.fail.cpp
@@ -0,0 +1,18 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// <utility> + +// template<class T, T N> +// using make_integer_sequence = integer_sequence<T, 0, 1, ..., N-1>; + +// UNSUPPORTED: c++98, c++03, c++11 + +#define _LIBCPP_TESTING_FALLBACK_MAKE_INTEGER_SEQUENCE +#include "make_integer_seq.fail.cpp"
diff --git a/test/std/utilities/intseq/intseq.make/make_integer_seq_fallback.pass.cpp b/test/std/utilities/intseq/intseq.make/make_integer_seq_fallback.pass.cpp new file mode 100644 index 0000000..c75d20b --- /dev/null +++ b/test/std/utilities/intseq/intseq.make/make_integer_seq_fallback.pass.cpp
@@ -0,0 +1,18 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// <utility> + +// template<class T, T N> +// using make_integer_sequence = integer_sequence<T, 0, 1, ..., N-1>; + +// UNSUPPORTED: c++98, c++03, c++11 + +#define _LIBCPP_TESTING_FALLBACK_MAKE_INTEGER_SEQUENCE +#include "make_integer_seq.pass.cpp"
diff --git a/test/support/test_macros.h b/test/support/test_macros.h index 420f4fa..c34e8cf 100644 --- a/test/support/test_macros.h +++ b/test/support/test_macros.h
@@ -26,6 +26,12 @@ #define TEST_HAS_EXTENSION(X) 0 #endif +#ifdef __has_builtin +#define TEST_HAS_BUILTIN(X) __has_builtin(X) +#else +#define TEST_HAS_BUILTIN(X) 0 +#endif + /* Make a nice name for the standard version */ #if __cplusplus <= 199711L # define TEST_STD_VER 3
